f2d91b20fd61777b594311cbcf20343ee14b074e,ambari-server/src/main/java/org/apache/ambari/server/api/util/StackExtensionHelper.java,StackExtensionHelper,mergeServices,#ServiceInfo#ServiceInfo#,134
Before Change
parentService.getConfigDependencies() :
Collections.<String>emptyList());
mergedServiceInfo.setConfigTypes(
childService.getConfigTypes() != null ?
childService.getConfigTypes() :
parentService.getConfigTypes() != null ?
parentService.getConfigTypes() :
Collections.<String, Map<String, Map<String, String>>>emptyMap());
After Change
}
mergedServiceInfo.setConfigTypes(new HashMap<String, Map<String, Map<String, String>>>());
if(childService.getConfigTypes() != null) {
mergedServiceInfo.getConfigTypes().putAll(childService.getConfigTypes());
}
if(parentService.getConfigTypes() != null) {
mergedServiceInfo.getConfigTypes().putAll(parentService.getConfigTypes());